From: Dan Winship <danw@gnome.org>
Date: Tue, 25 May 2010 13:34:01 +0000 (-0400)
Subject: [panel] fix alignment of app menu label
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~10038
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fff04d51b7d1c23ac79c1005c05f763bd6651ea4;p=gnome-shell.git

[panel] fix alignment of app menu label

we were aligning the top of the shadow with the top of the other labels,
rather than aligning the label itself

https://bugzilla.gnome.org/show_bug.cgi?id=618793
---

diff --git a/js/ui/panel.js b/js/ui/panel.js
index c938e01fb..11046459e 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -69,14 +69,14 @@ TextShadower.prototype = {
 
     _getPreferredWidth: function(actor, forHeight, alloc) {
         let [minWidth, natWidth] = this._label.get_preferred_width(forHeight);
-        alloc.min_size = minWidth;
-        alloc.natural_size = natWidth;
+        alloc.min_size = minWidth + 2;
+        alloc.natural_size = natWidth + 2;
     },
 
     _getPreferredHeight: function(actor, forWidth, alloc) {
         let [minHeight, natHeight] = this._label.get_preferred_height(forWidth);
-        alloc.min_size = minHeight;
-        alloc.natural_size = natHeight;
+        alloc.min_size = minHeight + 2;
+        alloc.natural_size = natHeight + 2;
     },
 
     _allocate: function(actor, box, flags) {
@@ -88,8 +88,8 @@ TextShadower.prototype = {
         let [minChildWidth, minChildHeight, natChildWidth, natChildHeight] =
             this._label.get_preferred_size();
 
-        let childWidth = Math.min(natChildWidth, availWidth);
-        let childHeight = Math.min(natChildHeight, availHeight);
+        let childWidth = Math.min(natChildWidth, availWidth - 2);
+        let childHeight = Math.min(natChildHeight, availHeight - 2);
 
         for (let i = 0; i < children.length; i++) {
             let child = children[i];